<<<<<<< HEAD
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');

class Tenders extends CI_Controller {
	function __construct(){
		parent::__construct();
		if(!isset($_SESSION)){
		    session_start();
		}
		exit();
	}
	
	/**
	 * 标列表
	 * @param $ftype 标类型
	 */
	function tlist($start = '',$end = ''){
		$time1 = date('Y-m-d', strtotime(date('Y-m-d 00:00:00'))-24* 60 * 60);
		$time2 = date('Y-m-d', strtotime(date('Y-m-d 00:00:00'))-24* 60 * 60);
		$data['where']['strtime']  			= $start?$start:$time1;
		$data['where']['endtime'] 			= $end?$end:$time2;
		$this->load->model('Borrow_model');
		$tender_list = $this->Borrow_model->tenders_list($data);
		$vdata['tender_list'] = $tender_list;
		$this->load->view('borrow/tender_list', $vdata);
	}
=======
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');

class Tenders extends CI_Controller {
    function __construct(){
		parent::__construct();
		if(!isset($_SESSION)){
		    session_start();
		}
		exit();
	}
	
	/**
	 * 标列表
	 * @param $ftype 标类型
	 */
	function tlist($start = '',$end = ''){
		$time1 = date('Y-m-d', strtotime(date('Y-m-d 00:00:00'))-24* 60 * 60);
		$time2 = date('Y-m-d', strtotime(date('Y-m-d 00:00:00'))-24* 60 * 60);
		$data['where']['strtime']  			= $start?$start:$time1;
		$data['where']['endtime'] 			= $end?$end:$time2;
		$this->load->model('Borrow_model');
		$tender_list = $this->Borrow_model->tenders_list($data);
		$vdata['tender_list'] = $tender_list;
		$this->load->view('borrow/tender_list', $vdata);
	}
>>>>>>> d47623b610d79a4eeb489500830c00d70933f414
}